Skip to content
This repository has been archived by the owner on Jan 11, 2025. It is now read-only.

[pull] main from osbuild:main #3

Merged
merged 10 commits into from
Jan 8, 2025
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 25, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Makes it possible to build images based on Alma Linux bootc containers, such as `quay.io/almalinuxorg/almalinux-bootc:9.5`

Fixes #753

Signed-off-by: ItalyPaleAle <[email protected]>
@pull pull bot added the ⤵️ pull label Dec 25, 2024
dependabot bot and others added 9 commits January 6, 2025 06:19
Bumps the go-deps group with 2 updates in the /bib directory: [github.com/osbuild/images](https://github.com/osbuild/images) and [golang.org/x/sys](https://github.com/golang/sys).


Updates `github.com/osbuild/images` from 0.106.0 to 0.107.0
- [Release notes](https://github.com/osbuild/images/releases)
- [Commits](osbuild/images@v0.106.0...v0.107.0)

Updates `golang.org/x/sys` from 0.28.0 to 0.29.0
- [Commits](golang/sys@v0.28.0...v0.29.0)

---
updated-dependencies:
- dependency-name: github.com/osbuild/images
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
...

Signed-off-by: dependabot[bot] <[email protected]>
This commit disables the fedora ISO test for now. The download of
the RPMs tends to be very fragile, often mirrors are outdated or
broken and we get many 404 or 500 errors.

The real fix is of couse to switch to a librepo based downloading
in osbuild but for now we just disable this test so that we can
merge PRs again without having to retry multiple times :(
Extend version with printing also the timestamp and
"tainted" if not all files are checked in.
Also support calling it with `--version` or `-v`.
Changes the version output to be more parser friendly
for simple split or yaml parsers.
Error handling on argument parsing. Remark from golangci-lint.
Fedora N-1 (40 now) is stable, but will eventually get stale.
In my case we happen to be using this image as a "builder"
image and I added a new feature to rpm-ostree, which I didn't
ship to F40. I may still do so.

However it's clearly a good idea for us to keep updated.

This all said, it's actually not clear to me that Fedora is
the right default base image - it may make sense to target
e.g. c10s or c9s?

This all relates to https://gitlab.com/fedora/bootc/tracker/-/issues/2
as well.

Signed-off-by: Colin Walters <[email protected]>
This commit enables bib to work with the qemu-9.1+openat2 patches
as proposed in https://src.fedoraproject.org/rpms/qemu/pull-request/70.

With the qemu-user-statuc-aarch64 rpm produced by `fedpkg mockbuild`
from this package the cross-arch test build works again.
```
$ sudo PYTHONPATH=. pytest './test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]' -s -vv
============================= test session starts ==============================
platform linux -- Python 3.12.7, pytest-7.4.3, pluggy-1.3.0 -- /usr/bin/python3
cachedir: .pytest_cache
rootdir: /home/mvogt/devel/osbuild/bootc-image-builder
configfile: pytest.ini
plugins: repeat-0.9.3, xdist-3.5.0
collected 1 item

test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64] [1/2] STEP 1/9: FROM registry.fedoraproject.org/fedora:40 AS builder
...
PASSEDChecking disk usage for /var/tmp/bib-tests/shared0/68b20145da2cd3f2/image/disk.raw
NOTE: disk usage after /var/tmp/bib-tests/shared0/68b20145da2cd3f2/image/disk.raw: 712472.71936 / 1998694.907904
Untagged: quay.io/centos-bootc/centos-bootc:stream9
Deleted: 0de1f90b11cbe7e2768101f6c55b4dd9841c13a2f87c8d9c177aea74ade88050

============================= slowest 10 durations =============================
1033.54s setup    test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
67.62s call     test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
2.30s teardown test/test_build.py::test_image_boots[quay.io/centos-bootc/centos-bootc:stream9,raw,CentOS Stream 9 ({arch}),arm64]
======================== 1 passed in 1103.58s (0:18:23) ========================
```
This commit adds the https://launchpad.net/~mvo/+archive/ubuntu/qemu/
PPA that contains a backport of the openat2 patches for qemu-9 so
that we can test cross-arch building again.
@hanthor hanthor merged commit f2113d9 into centos-workstation:main Jan 8, 2025
1 check failed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants